* insdel.c (Fcombine_after_change_execute): Return nil if

combine_after_change_buffer has been invalidated.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d806c79cd691ee01aa5cf3b6a4605bfab8561ad..e57124b56cab5f2b3d73344dcc9b2b4bcbd2e280 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-28  Chong Yidong  <cyd@stupidchicken.com>
+
+       * insdel.c (Fcombine_after_change_execute): Return nil if
+       combine_after_change_buffer has been invalidated.
+
 2007-02-25  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * m/xtensa.h: New file.